From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 4 Jan 2022 13:29:13 +0000 (+0100)
Subject: gdk/display-wayland: Don't bypass portal for theme entries
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~61^2^2~119^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9e5d412a8b59d994ef1b2e0f4ccaee6e14016d69;p=gtk4.git

gdk/display-wayland: Don't bypass portal for theme entries

When commit 49589e1da added support for the new high-contrast key,
it missed that the getter should only use the setting directly when
not going through the portal.

https://gitlab.gnome.org/GNOME/gtk/-/issues/4593
---

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 1b6f728f06..2017e90518 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -2110,7 +2110,11 @@ set_theme_from_entry (GdkDisplay       *display,
   GSettingsSchema *schema = NULL;
   gboolean hc = FALSE;
 
-  settings = (GSettings *)g_hash_table_lookup (display_wayland->settings, "org.gnome.desktop.a11y.interface");
+  if (display_wayland->settings_portal == NULL)
+    {
+      settings = (GSettings *)g_hash_table_lookup (display_wayland->settings,
+                                                   "org.gnome.desktop.a11y.interface");
+    }
 
   if (settings)
     g_object_get (settings, "settings-schema", &schema, NULL);